From: Keir Fraser <keir.fraser@citrix.com>
Date: Fri, 25 Jun 2010 14:45:50 +0000 (+0100)
Subject: svm: use wrmsrl
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11876
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=67da0f0cf8252d9c4882fb628c38a105f974eb99;p=xen.git

svm: use wrmsrl

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
---

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 01c94c52f1..ba0cf802cf 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -862,8 +862,7 @@ static void svm_init_erratum_383(struct cpuinfo_x86 *c)
 
 static int svm_cpu_up(void)
 {
-    u32 phys_hsa_lo, phys_hsa_hi;   
-    uint64_t phys_hsa, msr_content;
+    uint64_t msr_content;
     int rc, cpu = smp_processor_id();
     struct cpuinfo_x86 *c = &cpu_data[cpu];
  
@@ -881,10 +880,7 @@ static int svm_cpu_up(void)
     write_efer(read_efer() | EFER_SVME);
 
     /* Initialize the HSA for this core. */
-    phys_hsa = (u64)virt_to_maddr(hsa[cpu]);
-    phys_hsa_lo = (u32)phys_hsa;
-    phys_hsa_hi = (u32)(phys_hsa >> 32);    
-    wrmsr(MSR_K8_VM_HSAVE_PA, phys_hsa_lo, phys_hsa_hi);
+    wrmsrl(MSR_K8_VM_HSAVE_PA, (uint64_t)virt_to_maddr(hsa[cpu]));
 
     /* check for erratum 383 */
     svm_init_erratum_383(c);